From: Tom Rini <trini@konsulko.com>
Date: Mon, 18 Jun 2018 16:59:46 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=378b29cbc6607ad8246b1381bc74ec62bdb19105;p=project%2Fbcm63xx%2Fu-boot.git

Merge git://git.denx.de/u-boot-x86
---

378b29cbc6607ad8246b1381bc74ec62bdb19105